Skip to content

Merge queue: make dev checks required + add .asf.yaml validation#21239

Merged
blaginin merged 2 commits intomainfrom
db/mq-is-back
Apr 2, 2026
Merged

Merge queue: make dev checks required + add .asf.yaml validation#21239
blaginin merged 2 commits intomainfrom
db/mq-is-back

Conversation

@blaginin
Copy link
Copy Markdown
Member

@blaginin blaginin commented Mar 29, 2026

Related to #6880

Follow up on #17538

Bringing back the merge queues 🤞🏻
Last time it was painful because:

  • there was no .asf.yaml validation
  • if something goes wrong, we weren't able to force merge without the infra team

this PR solved the first problem. As for the second one, I have the permissions to bypass so should be able to quickly revert if something ever goes bad

image

Check result: https://github.com/apache/datafusion/actions/runs/23715604583/job/69082077684?pr=21239

I also checked that CI will keep working by merging this into our sandbox and then opening and merging a dummy pr

For now, bringing just the basic checks (in dev.yml). Will do rust.yml separately if everything goes smoothly after this one is merged

@blaginin blaginin self-assigned this Mar 29, 2026
@github-actions github-actions bot added the development-process Related to development process of DataFusion label Mar 29, 2026
@blaginin blaginin marked this pull request as ready for review March 29, 2026 18:27
@blaginin blaginin requested review from 2010YOUY01 and alamb March 30, 2026 12:00
@alamb
Copy link
Copy Markdown
Contributor

alamb commented Mar 30, 2026

Amazing -- this will be so nice

Copy link
Copy Markdown
Contributor

@alamb alamb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @blaginin

What do you think of the codeql suggestion to limit the token? I think that is a good idea in light of the recent npm supply chain attacks

Also, does this PR enable the merge queue? I didn't see any specific change but maybe I missed it

contexts:
- "Check License Header"
- "Use prettier to check formatting of documents"
- "Validate required_status_checks in .asf.yaml"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a clever idea

@blaginin
Copy link
Copy Markdown
Member Author

blaginin commented Mar 30, 2026

thanks for the review!

What do you think of the codeql suggestion to limit the token? I think that is a good idea in light of the recent npm supply chain attacks

sure! i think we need to limit those for all the actions, will do that in a PR on top

Also, does this PR enable the merge queue? I didn't see any specific change but maybe I missed it

it's actually already enabled!

image currently it's a no-op because there are no required checks (MQ only runs the required ones). once we add them, the merge queue will start working!

@blaginin blaginin enabled auto-merge April 2, 2026 10:34
@alamb
Copy link
Copy Markdown
Contributor

alamb commented Apr 2, 2026

So is the idea that once we merge this, we will be able to hit "merge' and the PR will merge once all the CI checks pass?

@alamb
Copy link
Copy Markdown
Contributor

alamb commented Apr 2, 2026

sure! i think we need to limit those for all the actions, will do that in a PR on top

As in you will make a follow on PR to this one?

Copy link
Copy Markdown
Contributor

@alamb alamb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can finally have nice things!

@blaginin blaginin added this pull request to the merge queue Apr 2, 2026
Merged via the queue into main with commit 18af518 Apr 2, 2026
60 checks passed
@blaginin blaginin deleted the db/mq-is-back branch April 2, 2026 21:43
github-merge-queue bot pushed a commit that referenced this pull request Apr 3, 2026
- Related to
#21295 (comment)

- Follow on to #21239

## Which issue does this PR close?

<!--
We generally require a GitHub issue to be filed for all bug fixes and
enhancements and this helps us generate change logs for our releases.
You can link an issue to this PR using the GitHub syntax. For example
`Closes #123` indicates that this PR will close issue #123.
-->

- Closes #.

## Rationale for this change

<!--
Why are you proposing this change? If this is already explained clearly
in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand
your changes and offer better suggestions for fixes.
-->

## What changes are included in this PR?

<!--
There is no need to duplicate the description in the issue here but it
is sometimes worth providing a summary of the individual changes in this
PR.
-->

## Are these changes tested?

<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code

If tests are not included in your PR, please explain why (for example,
are they covered by existing tests)?
-->

## Are there any user-facing changes?

<!--
If there are user-facing changes then we may require documentation to be
updated before approving the PR.
-->

<!--
If there are any breaking changes to public APIs, please add the `api
change` label.
-->
zhuqi-lucas pushed a commit to zhuqi-lucas/arrow-datafusion that referenced this pull request Apr 4, 2026
…che#21239)

Related to apache#6880

Follow up on apache#17538

Bringing back the merge queues 🤞🏻
Last time it was painful because: 
- there was no `.asf.yaml` validation
- if something goes wrong, we weren't able to force merge without the
infra team

this PR solved the first problem. As for the second one, I have the
permissions to bypass so should be able to quickly revert if something
ever goes bad

<img width="830" height="151" alt="image"
src="https://github.com/user-attachments/assets/62fb2bb5-44d8-4aae-a006-188d96728140"
/>


Check result:
https://github.com/apache/datafusion/actions/runs/23715604583/job/69082077684?pr=21239

I also checked that CI will keep working by
[merging](apache/datafusion-sandbox#197) this
into our sandbox and then opening and merging [a dummy
pr](apache/datafusion-sandbox#204)

For now, bringing just the basic checks (in dev.yml). Will do rust.yml
separately if everything goes smoothly after this one is merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

development-process Related to development process of DataFusion

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants